From 2b1966e931bb2685d099374464139799bf7f63db Mon Sep 17 00:00:00 2001 From: Jimi Xenidis Date: Tue, 28 Nov 2006 16:43:53 -0500 Subject: [PATCH] [XEN][POWERPC] secondary_cpu_init() does not return. Signed-off-by: Jimi Xenidis Signed-off-by: Hollis Blanchard --HG-- extra : transplant_source : %A2%A4%A6%BD%C5%CD%ED%F3%FE%90bm%E9%B1l%9E%E8%98%F1x --- xen/arch/powerpc/exceptions.h | 2 +- xen/arch/powerpc/setup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/powerpc/exceptions.h b/xen/arch/powerpc/exceptions.h index 0dcc504620..7a71faee8d 100644 --- a/xen/arch/powerpc/exceptions.h +++ b/xen/arch/powerpc/exceptions.h @@ -52,5 +52,5 @@ extern ulong *__hypercall_table[]; extern char exception_vectors[]; extern char exception_vectors_end[]; extern int spin_start[]; -extern int secondary_cpu_init(int cpuid, unsigned long r4); +extern void secondary_cpu_init(int cpuid, unsigned long r4); #endif diff --git a/xen/arch/powerpc/setup.c b/xen/arch/powerpc/setup.c index 39245d4250..aaceab164b 100644 --- a/xen/arch/powerpc/setup.c +++ b/xen/arch/powerpc/setup.c @@ -256,7 +256,7 @@ static int kick_secondary_cpus(int maxcpus) } /* This is the first C code that secondary processors invoke. */ -int secondary_cpu_init(int cpuid, unsigned long r4) +void secondary_cpu_init(int cpuid, unsigned long r4) { struct vcpu *vcpu; @@ -274,7 +274,7 @@ int secondary_cpu_init(int cpuid, unsigned long r4) idle_vcpu[cpuid] = current; startup_cpu_idle_loop(); - while(1); + panic("should never get here\n"); } static void __init __start_xen(multiboot_info_t *mbi) -- 2.30.2